enhance flexibility

增强灵活性